Merged.

diff --cc tools/python/xen/xend/XendDomainInfo.py
index 0ad6f5a7dd627617418c4a5e101e596f76b07fe2,2c92da390e1086e18e94951fd195f60f3bff6007..5c0ae8c12090fa67beaff2aff720f42307179152
--- 1/tools/python/xen/xend/XendDomainInfo.py
--- 2/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@@ -449,10 -428,7 +438,10 @@@ class XendDomainInfo
              defaultInfo('on_crash',     lambda: "restart")
              defaultInfo('cpu',          lambda: None)
              defaultInfo('cpu_weight',   lambda: 1.0)
-             defaultInfo('vcpus',        lambda: 1)
+             defaultInfo('vcpus',        lambda: int(1))
 +
 +            self.info['vcpus'] = int(self.info['vcpus'])
 +
              defaultInfo('vcpu_avail',   lambda: (1 << self.info['vcpus']) - 1)
              defaultInfo('bootloader',   lambda: None)
              defaultInfo('backend',      lambda: [])